(thing-at-point-file-name-chars): Include

non-ASCII again and re-write the filename ops.

diff --git a/lisp/thingatpt.el b/lisp/thingatpt.el
index 3e6b344a3f29e1afd4669a3b414c6c7fbe06177b..70f25da673a4879ed74116d220d21e22ae4111d5 100644 (file)
--- a/lisp/thingatpt.el
+++ b/lisp/thingatpt.el
@@ -195,13 +195,19 @@ a symbol as a valid THING."
 
 ;;  Filenames and URLs  www.com/foo%32bar
 
-(defvar thing-at-point-file-name-chars "~/A-Za-z0-9---_.${}#%,:"
+(defvar thing-at-point-file-name-chars "-~/[:alnum:]_.${}#%,:"
   "Characters allowable in filenames.")
 
 (put 'filename 'end-op    
-     (lambda () (skip-chars-forward thing-at-point-file-name-chars)))
+     (lambda ()
+       (re-search-forward (concat "\\=[" thing-at-point-file-name-chars "]*")
+                         nil t)))
 (put 'filename 'beginning-op
-     (lambda () (skip-chars-backward thing-at-point-file-name-chars)))
+     (lambda ()
+       (if (re-search-backward (concat "[^" thing-at-point-file-name-chars "]")
+                              nil t)
+          (forward-char)
+        (goto-char (point-min)))))
 
 (defvar thing-at-point-url-path-regexp
   "[^]\t\n \"'()<>[^`{}]*[^]\t\n \"'()<>[^`{}.,;]+"